Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 23 Mar 2010 01:05:35 +0000 (01:05 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 23 Mar 2010 01:05:35 +0000 (01:05 +0000)

Trivial merge